add libgw32 and its dependencies to LDADD for the win32 platform

2005-12-17  Michael Schumacher  <schumaml@cvs.gnome.org>

	* extensions/Makefile.in: add libgw32 and its dependencies to
	LDADD for the win32 platform

diff --git a/ChangeLog b/ChangeLog
index b8487baed3df78352b953c7f559885f56064f306..e26caf1bc36b29be258785a69bc673c2e461c300 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-17  Michael Schumacher  <schumaml@cvs.gnome.org>
+
+       * extensions/Makefile.in: add libgw32 and its dependencies to
+       LDADD for the win32 platform
+
 2005-11-10  Øyvind Kolås  <pippin@gimp.org>
 
        * docs/index-static.html.in: Minor reformulations and spelling fixes.

diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 927c904f7ef553a283b9196b22de12baec48f6ec..1f909c80b9bd0aceeedca9151232b5d3c9f94a73 100644 (file)
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -1,6 +1,9 @@
 # General minimalistic compile file for self contained single
 # file babl_extensions
 
+@OS_WIN32_TRUE@win32_libs = -lgw32c -liberty -lole32 -luuid -lwsock32
+@OS_WIN32_TRUE@no_undefined = -no-undefined
+
 CC = @CC@
 
 CFILES  = $(wildcard *.c)
@@ -11,7 +14,7 @@ all: $(SOBJS)
 CFLAGS  += -Wall
 
 %.so: %.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 
 # if extension needing external libraries are to be # compiled with this make
 # file, each of them can be added according to the this pattern:
@@ -19,14 +22,16 @@ CFLAGS  += -Wall
 #      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  [own compile and link flags]
 
 CIE-Lab.so: CIE-Lab.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  -lm
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) -lm
 lcms.so: lcms.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  `pkg-config lcms --cflags --libs`
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
 
 
 
 #############################################################################
-LDFLAGS = -shared -lc
+LDFLAGS += -shared 
+
+LDADD    = ../babl/.libs/libbabl.a $(win32_libs) $(no-undefined)
 
 CFLAGS  += -I../babl